From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 28 Apr 2011 00:22:37 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3911^2~44
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fddfaa5a22e2094e362c4096fb5a88a5e76296bf;p=emacs.git

Merge from mainline.
---

fddfaa5a22e2094e362c4096fb5a88a5e76296bf